bitkeeper revision 1.736.2.1 (403a1681ObzkQMYrzhAMAOBqjcQLSA)

Support for BLKGETSIZE64 ioctl().  As a side effect, this eliminates some
common warning messages the the XenoLinux block device driver.

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index ea27340633c9bfeedafb6b0e608ac0bbd790449a..ec3e92e0bc7cffdbe6b0ca6c627c5683c6e554b1 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -21,6 +21,7 @@ kaf24@scramble.cl.cam.ac.uk
 kaf24@striker.cl.cam.ac.uk
 laudney@eclipse.(none)
 lynx@idefix.cl.cam.ac.uk
+mwilli2@equilibrium.research.intel-research.net
 rac61@labyrinth.cl.cam.ac.uk
 rgr22@boulderdash.cl.cam.ac.uk
 rn@wyvis.camb.intel-research.net

diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c
index 883cee38fc013d2f13ca94a9f85cdb06e52ecb39..a91ed32a744c2539d182f05b2ca15452b4f4552d 100644 (file)
--- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c
+++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c
@@ -164,6 +164,11 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep,
         DPRINTK_IOCTL("   BLKGETSIZE: %x %lx\n", BLKGETSIZE, part->nr_sects); 
         return put_user(part->nr_sects, (unsigned long *) argument);
 
+    case BLKGETSIZE64:
+        DPRINTK_IOCTL("   BLKGETSIZE64: %x %llx\n", BLKGETSIZE64,
+                      (u64)part->nr_sects * 512);
+        return put_user((u64)part->nr_sects * 512, (u64 *) argument);
+
     case BLKRRPART:                               /* re-read partition table */
         DPRINTK_IOCTL("   BLKRRPART: %x\n", BLKRRPART);
         return xenolinux_block_revalidate(dev);